Updated for non animated transitions