Jason's changes #bs-44