Streamlining and new functions
small correction