update to use standard keys