rewoked some changes