more functions
10 files changed