major code simplification, got rid of confirmation boxes