Changed default functionality