changes in light of @hectcastro comments