Merge changes in without couts

Very little changes took a few commits because got a bit confused with github not for the first or last time