did some changes, pull the styling branch to see my changes