Some changes, refactoring to func