Implement minor changes on branch adam