Added some this pointers to be more specific