Changed parameters and correct the weird rpm calculation...