adding stuff back in