Changed longs to Doubles