Dont need all that conditions
Just make Wrapper work
Revert changes to Memory