changed some actually not necessary things