more paperclip changes