finalizing #2

renamed again, deleted the armed version