changed eps to be more accurate
merging