New version with bug fix and such