more hacky stuff