Extracted bonus functions to separate files