Can we get rid of this line or replace it with something?