Added smoke and yellow