A better version

Many function was OK. Let us do better!!