update to be ingtegrated with Bundle