merging Alexs pull request from 4-23@9:15pm