Ape191214 - refactoring