Added files for ex16 & ex17