more changes to allow an override