Updated Rinari
Fixing things up
Whew