A proper version