removing duplicate code form Halloween