Made some Changes from Chris Cobb's previous Commit..!