Some aditional changes