0.15 changes by fluBBa