Changed up some things =)