Addressed Alex' comments