Added changes for accommodating score