again some little changes (diff between my and matteo's code)