v1.4 rolled back + minor changes