Update strapped and refactor