Further integration/streamlining modifications