now adding all the goodies back in