Changes for next releae