fixing ASI warnings.
applying changes from Basic to Intermediate.