Forgot to add the updated files in last commit, so here they are