Udated for 3.6 and removed RS and B&M.