Changes from morq