changed structure and names etc...