Butt-Bot's Revenge

Same thing as before, should be mergable now.