added rest of things