Changes to ensure things are running in the correct order