REFACTOR about to reflect shahar ma