Importing more code from old source