Added more details about self. Should do a mock-up