updated, proper version