Atsep217_218_Merged