added some stuff and figure out the masking and calling stuff