Final update (everything seems to be ok now)