Applied tweak as per Thomas