Update more funcitonality