Made some changes on the development branch