Changes required due to function simplification