more hackery, working