changed structure
further changes