Added flash; working on comments