Some changes :D