Final commitment as of june 24th

all controllers edited