some new changes (dont remember ...)