fianal version - stil a lot to fix - no time