uncommeting main methods