more prototype enhancements