Fixed from final presentation