change these to better variables?