Furhter changes. Use a diff?