Yo
Many style and some functionality changes