discuss and review this with @pablopareja