Fixed notation issues
First draft