Updateto fit my needs