tweaks from phone call with Ali