Begin rescheming
Adjust some spacing