Changed from self to that respective Classes because it threw an error otherwise