Updating to match requirements