Addressed changes