Added Shortcut Macros and different problem format