Changes from fork