go back to simpler / slower functions for now