263 fixed design split into smaller export function

263 fixed design split into smaller export function #560