Committing more helper functions...