offline feature refactor/bugfix done