Trying those two tweaks again without all the BS.