need to improve this
no more slug try
missed this
clean up