I will add changes as you said :)