Undersore 2 problems solved