Updated version... again.