Added new functions & a litte style