Worked some changes