jarod_gibson's patches