fixed if
fixed uncommmitted return
removed function for uncommitted