more changes for standalone app