Re-arranged defenses & preliminary log implementation