Started to work on some changes