Additional Changes from last commit