Let the platform do the work

Sugar 12.0