Version 1.4.2 or higher - small refactoring