OSCAR-0

Reverting back to snapshot.