Moved more into the relevant methods