done with Adam's portion v1