Addressed jryans' comments