new updates to fix large bug