Update and Refactor