Added some funcitonalities