combined two apps into one, many enhancements