more smart version of previous commit