updated for todays Patchmas