Made changes to allow for importing