fake wrapper refactor