Second commit Fixing