there are a LOT of these lines now.. is there any way we can reduce the duplication a bit here?