updated for beam5 changes - still needs more...