change directions
Change directions and some tweaks