Improved artwork logic