Shortcuts and chaining
Several changes