Minor Changes - Need going over