more changes for standalone usage