Changes Fixed #3