Final Changes with Documentation