Added components to run BEFORE auto p