moved to improved implementation of input format. Still to be tested