Mechanic enhancements