Changed some shortcut things