some more changes. bit drunk