new version fixs bugs