Fixing the main methods