Moved code for efficiency