BF: Updated to work with new keyboard events