Updated the main methods