Updated version of elliptics