iLove initial changes on v1.7.2