Fixed stuff for Tom