next commit with some little bugs...