Implemented Buffer Strategy!