change these back to functions because whalesong