missed to copy some of the new code to the standalone version