A few changes. Now answes to calls