Added changes in accordance with new requirements