Cleaned up toms mess. :D