Integrate feedback from Shinmera.