small modifs...