Bring in toiletfreak's changes
fixed conflict