fixed redfine and other