renamed stuff. ready for sqp