Updated following initial testing