Updated with lots of info