Huge update after 2 months