[Added] More changes