first part of changes to tbeam implementation, currently not working