Added changes to keep people happy