problem solved i hope
dont quite know yet
Merge branch 'zed'