Almost at point where it can be released
Added dump