WIP Patch, for second shift feedback.