Make it work gooder