static functionally todo fix