updated because David is CRAZY!
Merge remote-tracking branch 'origin/Temp-Manager' into Temp-Manager