Marked some changes to be thought about