Logic change in lab1