fix sets

should be ok now
TODO : shorter method names?