gadget fun - mallet works on my end, try it out
fixing merge conflicts