Troy's changes/additions