Some changes

;)