Aditional changes added