Was a little to fast. Need to check unit tests first.