added paperclip functionality
manually removed conflicts