New version, fixed dependencies