work on fixing mode control