Changed the return values back from NSNumber to Double