Addressed issues