Started some changes