added changes to help navigate around