Finished notes ! need test