Make few changes