Semantics adjusted on main library but still untested...