adjustments to be more flexible in other containers