Replaced class pic. Modified refs