Little refactoring
Get rid of duplicated code
Add check for Crea path
Little bugfixing