Josh's changes 5/4