Updated to full version