further development, implemented custom commander