Update for astrofrog's comments