some changes
fuck
after merge