Fix bar
More updates