Switching from definition to block environments