Working version, buildpath fix