Adjusted for new keyboard