looking much closer to final version here