Minor Changes Final Version 1.1.7