fixed teh issues or redefinitions.