More temp hackery