re-tool mult, add away from static