solving circular dependency
commit actualiza