more safety code