Reverted to shell wrapper