Updated per requirements