Mega update! Let's call it v2.0