wishing this would clean itself up..