commiting after first draft of FIN-395