Huge logic, command & version changes