Fixing Toms crap