Small changes for Johnny's future PR #296

Closed micahdbak closed 1 month ago