reverting previous tweak and adding some other