updated to latest structure