added support of two version of controls - try them please
1