some rearranging and added thoughts