Addressed issue 11