it is a mess now
merge
mass is clean
better