Addressed Sarina's second batch of comments