added better shortcuts