Few changes of logic