Catalyst: minimal changes