Merged changes with expanded universe and sats