update due to code changes, also added using and extending sections