working on 0.4.0; added xNone