Indentation in this method needs looking at