update on previous commit
continue report refactoring