More gooder contains checking