Better rake instructions
Merge