-- Complete update, revamped --