Fixed project in accordance with dan and zamir's suggestions