Isolated/commented my own stuff