all the changes I have up till now..