Made buffer an option
Enable APC