Commit 37

Shortcut and style for shortcut working