Final version for now.4.0