Erik's March 12 bot
merging changes