Uploaded new public version 2