Added in some of Brian/Dexter's changes