changes based on feedback from vilagos