added new input specification + some minor changes