expanded functionality and structure