Included last changes on commandline