Fourth commit After Ui Integration