tweaks, removed apollo flag and removed data