Completed changes for BTR