Moved to use -E instead of tmp home directory