added safety