Few modifications..