commit before going to dan's place
merge before going to dan's place