hopefully diet pill will work over network now
fixed merge conflict in diet pill