Minor Changes for the first version