x
refactoring @andrestorrez s code