Additional changes to get back to base