added smoke and flip