Is this needed? Might be simpler to leave this out to start with.