Preparing for paperclip branch