Second Version

Big update