Some changes to make me happy :)