updated bucket handler