Fixed stuff, using the clever stuff now.