Added Josh's changes