Fixed commends, renamed fun for consistency