Added manual range assignment