Adding tutorial compatibility