added disable flag to controller