Updates to the latest version

@adaborah_GH, Maybe you should read this first