Rama edits

We should merge stuff