Updated with more stuff