reverting some of previous commit changes and re-tweaking