additions for a few edge use cases