Addressed partial review comments