synced with code on my pc, updated rake