+changes made by Mafi on April 12, 2014