merging code with ronaldo version