Streamlining

All behavior is correct. We should be able to push V2.5. :+1: