Move only to except, so we can build tags