Added cmd line start up