Some ordinary short-cuts added