Deactivated a new function until fixed