Updated with more updates