Commit tigran and roberts changes