reorganized inputs as per #103