Refinements
Finished addressing feedback items