Update for Taberareloo 4.0.0