Some changes(Thanks Kra1o5)