Artwork changes. Refactoring