changed screen key to C-z
merge on walnut