FINAL COMMITS - FIXED CONTROLS