condense to two files