Updated with Paperclip