Some cocoa improvement make life easier