refactoring continued, funds redistribution