removed some stuff for thomas