fixing after tom