updated to v.7 - lots of errors corrected in core methods