BEST PULL REQUEST: 2 NEW FEATURES B*TCH