First changes from omer's sketch