Removed old approach
wip