This is the correct version.. finally.