Sending up @warrenwinter 's changes!