Updated with new Documentation

Finished code