Fix additional funcitonality