Some useful change have been implemented