9/18 modified code