fixing to a working version - woo!