Ruben's Changes

Please take it