Added a create random buffer and adjusted the keys