refactor to remove foundation
refactor to remove foundation