some resque stuff
merge fix