Added in some lines of code