updated names and conbined function modules