minor modifications from previous commit, looks like what is showing in Github is truncated