redesign safe and handle no keys