Rejig keys a little more + document keys :D