Added fade checks and semicolons