old changes to 8 lying around here^^
minor changes