Changed paths to relative, added data. Forked from Brian's