Fix design
Fix rake task