reverts previous commit and brings up a better solution