lots of stability enhancements yey