Some changes
Added stuff