Made more changes on development branch