ok, removed last few unnecessary shortcuts