make things less of a hack