added some stuff for john