didn't liked the previous tweak, trying a new one for the first bit