Updated versions becuase of conflicts with devel