refactor with more zee feedback