Rayami build

Suggestions

Updates Add

Comments