altered several aspects to match functions. added function for firmness