added get wrap
refactor to make