Updated to the last changes on standalone.launch