Vysakh's Second commit