added saftey