added another property but i'm not sure it's executed in the best way