update, now to make it standalone!