firs commit for proble #1