V1.1.4, revamped v1.2.0-SNAPSHOT