Fun does not eclipse safety

Safety plan for eclipse