changes for beta 3 (crashes compiler)
still have a problem with signing