more logic checks in baseprep