Changed a few shortcuts