Some Modifications..