Fixing up sugar implementation to work.