Updated with style and some moving around