Adding Option to replace avg and closest fit