2 mor functions added