make sure to actually do dirty checking enhancements!! doh!