Trying to make release more flexible