Added changes to take care of initialValue