Merge erikcas changes