Some changes came into my mind :)