Last changes for development start