changes for standalone version