Updated with some of the updates