Rebased branch to LabrinthAVBBranch and re-added modifications.