Uncommented code after confirmed working on R15B03.