tweaks from meeting with rafi