Some more changes… I'm tired…. not really sure