Implemented first run
Bug fixes