Addressed #5 and #6