DB lab2 final final fix