Updating changes from RaiMan