Added run buffer and comments