Updated with the latest greyshade commits