Moved important method up