refactor? fix? something?