making it better. adding keys