3rd run at fixing silly mistakes