[CHANGES] Some improvements