refactoring
commenced midat