Amir minor changes to base