Jarod's changes 4