added some short cuts
merge