removed more funcitonality