Refactor + extending binb00 comm calc