bit more smart about the stuff now