div. lib enhancements