New Version. With new bugs.