Changed to use self instead of view for consistency