Big Update

edited controllers