changes based on luiz's suggestion