updated for more paperclip changes