deleting more stuff
adding everything for page